Fix flaky TestDistributorQuerier_QueryIngestersWithinBoundary#7419
Merged
CharlieTLe merged 1 commit intocortexproject:masterfrom Apr 13, 2026
Merged
Fix flaky TestDistributorQuerier_QueryIngestersWithinBoundary#7419CharlieTLe merged 1 commit intocortexproject:masterfrom
CharlieTLe merged 1 commit intocortexproject:masterfrom
Conversation
…cting clock The test was flaky because it captured `time.Now()` at setup, but `distributorQuerier.Select()` called `time.Now()` again internally. On slow CI runners, the clock drift could exceed the 10-second margin in the "maxT well after lookback boundary" subtest, causing the query to short-circuit with an empty result. Inject a `nowFn` function into `distributorQuerier` (defaulting to `time.Now`) so tests can freeze time. Replace the `InDelta` assertion with an exact `Equal` now that the clock is deterministic. Closes cortexproject#7415 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Charlie Le <charlie_le@apple.com>
CharlieTLe
added a commit
to CharlieTLe/cortex
that referenced
this pull request
Apr 13, 2026
…rsWithinBoundary Upstream fix (cortexproject#7419) injected a clock to eliminate timing drift. Removing our t.Skip since the root cause is properly fixed. Signed-off-by: Charlie Le <charlie.le@gmail.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Charlie Le <charlie_le@apple.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
nowFn func() time.TimeintodistributorQuerierso tests can control the clock, fixing the wall-clock race condition that caused flakiness on slow ARM CI runnersassert.InDeltawith exactassert.Equalnow that the clock is deterministic in teststime.Nowin production (passnilfornowFn)Closes #7415
Test plan
go test -count=100 -run TestDistributorQuerier_QueryIngestersWithinBoundary ./pkg/querier/...passes all 100 iterationsgo test ./pkg/querier/...suite passes with no regressions🤖 Generated with Claude Code